diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php
index f414947..25962eb 100644
--- a/system/helpers/smiley_helper.php
+++ b/system/helpers/smiley_helper.php
@@ -71,7 +71,7 @@
 		{
 			if (FALSE === ($smileys = _get_smiley_array()))
 			{
-				return $str;
+				return $smileys;
 			}        
 		}
 
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 3ad46f0..ad62409 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -163,6 +163,7 @@
 	<li>Removed extraneous load of $CFG in _display_cache() of the Output class (#3285).</li>
 	<li>Removed an unused parameter from Profiler (#3332).</li>
 	<li>Fixed a bug (#3330) in the FTP class where a comparison wasn't getting made.</li>
+	<li>Fixed a bug (#3328) where the smiley helper might return an undefined variable.</li>
 	<li>Fixed a bug (#3310) with sanitization of globals in the Input class that could unset CI's global variables.</li>
 	<li>Fixed a bug (#1890) in csv_from_result() where content that included the delimiter would break the file.</li>
 	<li>Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags to be handled incorrectly.</li>